Fix #8945: Support macro bundles #8964
+53
−10
We went looking everywhere, but couldn’t find those commits.
Sometimes commits can disappear after a force-push. Head back to the latest changes here.